Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 18 Sep 2011 16:53:03 +0000 (09:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 18 Sep 2011 16:53:03 +0000 (09:53 -0700)

Trivial merge